Remove two seemingly obsolete patches

diff --git a/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch b/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch
deleted file mode 100644 (file)
index 3ee8f3b..0000000
--- a/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 24 Jul 2019 09:08:39 +0200
-Subject: Check for definition of AT_SECURE before using it
-
-This fixes compilation on kfreebsd-*.
-
-Forwarded: https://github.com/ocaml/ocaml/pull/8842
----
- otherlibs/unix/envir_unix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/otherlibs/unix/envir_unix.c b/otherlibs/unix/envir_unix.c
-index 0eaac46..407884b 100644
---- a/otherlibs/unix/envir_unix.c
-+++ b/otherlibs/unix/envir_unix.c
-@@ -39,7 +39,7 @@ CAMLprim value caml_unix_environment_unsafe(value unit)
- 
- static char **secure_environ(void)
- {
--#ifdef HAS_GETAUXVAL
-+#if defined(HAS_GETAUXVAL) && defined(AT_SECURE)
-   if (!getauxval(AT_SECURE))
-     return environ;
-   else

diff --git a/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch b/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
deleted file mode 100644 (file)
index 04b3542..0000000
--- a/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 29 Jul 2020 16:22:39 +0200
-Subject: Disable DT_TEXTREL warnings on Linux i386
-
-Bug: https://github.com/ocaml/ocaml/issues/9800
----
- configure.ac | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e7772b9..ca53ac8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1708,6 +1708,16 @@ AS_CASE([$arch],
-       # Alpine and other musl-based Linux distributions
-       [common_cflags="-no-pie $common_cflags"])])
- 
-+# Disable DT_TEXTREL warnings on Linux i386
-+# See https://github.com/ocaml/ocaml/issues/9800
-+
-+AS_CASE([$host],
-+  [i?86-*-linux-*],
-+    [common_cflags="-Wl,-z,notext $common_cflags"
-+    mksharedlib="$mksharedlib -Wl,-z,notext"
-+    mkmaindll="$mkmaindll -Wl,-z,notext"],
-+  [])
-+
- # Assembler
- 
- AS_IF([test -n "$target_alias"],

diff --git a/debian/patches/series b/debian/patches/series
index 9e6cce73f8696ef4534639ee952c9ea0340ede34..e0d2d81ff4276cf98827ee181825316c4d6fe983 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ Put-manpages-in-section-3o-instead-of-3.patch
 Trigger-output-complete-exe-on-custom-with-an-enviro.patch
 Do-not-error-on-warnings-in-autoconf.patch
 Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
-Check-for-definition-of-AT_SECURE-before-using-it.patch
-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch